@payabli/sdk-node 0.0.114 → 0.0.117

package/dist/cjs/api/resources/query/client/Client.js

@@ -1,7 +1,5 @@
 "use strict";
-/**
- * This file was auto-generated by Fern from our API Definition.
- */
+// This file was auto-generated by Fern from our API Definition.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -45,16 +43,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Query = void 0;
-const environments = __importStar(require("../../../../environments.js"));
+exports.QueryClient = void 0;
+const BaseClient_js_1 = require("../../../../BaseClient.js");
+const headers_js_1 = require("../../../../core/headers.js");
 const core = __importStar(require("../../../../core/index.js"));
-const Payabli = __importStar(require("../../../index.js"));
 const json_js_1 = require("../../../../core/json.js");
-const headers_js_1 = require("../../../../core/headers.js");
+const environments = __importStar(require("../../../../environments.js"));
+const handleNonStatusCodeError_js_1 = require("../../../../errors/handleNonStatusCodeError.js");
 const errors = __importStar(require("../../../../errors/index.js"));
-class Query {
-    constructor(_options = {}) {
-        this._options = _options;
+const Payabli = __importStar(require("../../../index.js"));
+class QueryClient {
+    constructor(options = {}) {
+        this._options = (0, BaseClient_js_1.normalizeClientOptionsWithAuth)(options);
     }
     /**
      * Retrieve a list of batches and their details, including settled and
@@ -62,7 +62,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListBatchDetailsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -81,33 +81,36 @@ class Query {
     }
     __listBatchDetails(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchDetails/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchDetails/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -130,21 +133,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batchDetails/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batchDetails/{entry}");
         });
     }
     /**
@@ -152,7 +141,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListBatchDetailsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -171,33 +160,36 @@ class Query {
     }
     __listBatchDetailsOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchDetails/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchDetails/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -220,21 +212,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batchDetails/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batchDetails/org/{orgId}");
         });
     }
     /**
@@ -242,7 +220,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListBatchesRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -261,33 +239,36 @@ class Query {
     }
     __listBatches(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batches/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batches/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -310,21 +291,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batches/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batches/{entry}");
         });
     }
     /**
@@ -332,7 +299,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListBatchesOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -351,33 +318,36 @@ class Query {
     }
     __listBatchesOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batches/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batches/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -400,21 +370,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batches/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batches/org/{orgId}");
         });
     }
     /**
@@ -422,7 +378,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListBatchesOutRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -441,33 +397,36 @@ class Query {
     }
     __listBatchesOut(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchesOut/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchesOut/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -490,21 +449,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batchesOut/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batchesOut/{entry}");
         });
     }
     /**
@@ -512,7 +457,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListBatchesOutOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -531,33 +476,36 @@ class Query {
     }
     __listBatchesOutOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchesOut/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchesOut/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -580,21 +528,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batchesOut/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batchesOut/org/{orgId}");
         });
     }
     /**
@@ -602,7 +536,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListChargebacksRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -621,33 +555,36 @@ class Query {
     }
     __listChargebacks(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/chargebacks/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/chargebacks/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -670,21 +607,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/chargebacks/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/chargebacks/{entry}");
         });
     }
     /**
@@ -692,7 +615,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListChargebacksOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -711,33 +634,36 @@ class Query {
     }
     __listChargebacksOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/chargebacks/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/chargebacks/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -760,21 +686,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/chargebacks/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/chargebacks/org/{orgId}");
         });
     }
     /**
@@ -782,7 +694,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListCustomersRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -801,33 +713,36 @@ class Query {
     }
     __listCustomers(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/customers/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/customers/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -850,21 +765,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/customers/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/customers/{entry}");
         });
     }
     /**
@@ -872,7 +773,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListCustomersOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -891,33 +792,36 @@ class Query {
     }
     __listCustomersOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/customers/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/customers/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -940,21 +844,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/customers/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/customers/org/{orgId}");
         });
     }
     /**
@@ -962,7 +852,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListNotificationReportsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -981,30 +871,33 @@ class Query {
     }
     __listNotificationReports(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notificationReports/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notificationReports/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return {
@@ -1030,21 +923,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/notificationReports/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/notificationReports/{entry}");
         });
     }
     /**
@@ -1052,7 +931,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListNotificationReportsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1071,30 +950,33 @@ class Query {
     }
     __listNotificationReportsOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notificationReports/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notificationReports/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return {
@@ -1120,21 +1002,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/notificationReports/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/notificationReports/org/{orgId}");
         });
     }
     /**
@@ -1142,7 +1010,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListNotificationsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1161,30 +1029,33 @@ class Query {
     }
     __listNotifications(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notifications/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notifications/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1207,21 +1078,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/notifications/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/notifications/{entry}");
         });
     }
     /**
@@ -1229,7 +1086,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListNotificationsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1248,30 +1105,33 @@ class Query {
     }
     __listNotificationsOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notifications/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notifications/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1294,21 +1154,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/notifications/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/notifications/org/{orgId}");
         });
     }
     /**
@@ -1316,7 +1162,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListOrganizationsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1335,33 +1181,36 @@ class Query {
     }
     __listOrganizations(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/organizations/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/organizations/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1384,21 +1233,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/organizations/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/organizations/{orgId}");
         });
     }
     /**
@@ -1406,7 +1241,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListPayoutRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1425,33 +1260,36 @@ class Query {
     }
     __listPayout(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/payouts/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/payouts/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1474,21 +1312,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/payouts/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/payouts/{entry}");
         });
     }
     /**
@@ -1496,7 +1320,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListPayoutOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1515,33 +1339,36 @@ class Query {
     }
     __listPayoutOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/payouts/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/payouts/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1564,21 +1391,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/payouts/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/payouts/org/{orgId}");
         });
     }
     /**
@@ -1586,7 +1399,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListPaypointsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1605,33 +1418,36 @@ class Query {
     }
     __listPaypoints(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/paypoints/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/paypoints/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1654,21 +1470,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/paypoints/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/paypoints/{orgId}");
         });
     }
     /**
@@ -1676,7 +1478,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListSettlementsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1695,33 +1497,36 @@ class Query {
     }
     __listSettlements(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/settlements/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/settlements/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1744,21 +1549,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/settlements/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/settlements/{entry}");
         });
     }
     /**
@@ -1766,7 +1557,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListSettlementsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1785,33 +1576,36 @@ class Query {
     }
     __listSettlementsOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/settlements/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/settlements/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1834,21 +1628,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/settlements/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/settlements/org/{orgId}");
         });
     }
     /**
@@ -1856,7 +1636,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListSubscriptionsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1875,33 +1655,36 @@ class Query {
     }
     __listSubscriptions(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/subscriptions/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/subscriptions/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -1924,21 +1707,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/subscriptions/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/subscriptions/{entry}");
         });
     }
     /**
@@ -1946,7 +1715,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListSubscriptionsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1965,33 +1734,36 @@ class Query {
     }
     __listSubscriptionsOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/subscriptions/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/subscriptions/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2014,21 +1786,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/subscriptions/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/subscriptions/org/{orgId}");
         });
     }
     /**
@@ -2043,7 +1801,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListTransactionsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2062,33 +1820,36 @@ class Query {
     }
     __listTransactions(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transactions/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transactions/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2111,21 +1872,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transactions/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transactions/{entry}");
         });
     }
     /**
@@ -2147,7 +1894,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListTransactionsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2166,33 +1913,36 @@ class Query {
     }
     __listTransactionsOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transactions/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transactions/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2215,21 +1965,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transactions/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transactions/org/{orgId}");
         });
     }
     /**
@@ -2238,7 +1974,7 @@ class Query {
      * @param {Payabli.Entry} entry
      * @param {number} transferId - The numeric identifier for the transfer, assigned by Payabli.
      * @param {Payabli.ListTransfersPaypointRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2253,33 +1989,36 @@ class Query {
     }
     __listTransferDetails(entry_1, transferId_1) {
         return __awaiter(this, arguments, void 0, function* (entry, transferId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transferDetails/${encodeURIComponent(entry)}/${encodeURIComponent(transferId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transferDetails/${core.url.encodePathParam(entry)}/${core.url.encodePathParam(transferId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2302,21 +2041,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transferDetails/{entry}/{transferId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transferDetails/{entry}/{transferId}");
         });
     }
     /**
@@ -2324,7 +2049,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListTransfersRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2342,33 +2067,35 @@ class Query {
     }
     __listTransfers(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transfers/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transfers/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2391,28 +2118,14 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transfers/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transfers/{entry}");
         });
     }
     /**
      * Retrieve a list of transfers for an org. Use filters to limit results. Include the `exportFormat` query parameter to return the results as a file instead of a JSON response.
      *
      * @param {Payabli.ListTransfersRequestOrg} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2431,33 +2144,35 @@ class Query {
     }
     __listTransfersOrg(request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { orgId, exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transfers/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transfers/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2480,21 +2195,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transfers/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transfers/org/{orgId}");
         });
     }
     /**
@@ -2502,7 +2203,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListUsersOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2521,30 +2222,33 @@ class Query {
     }
     __listUsersOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/users/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/users/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2567,21 +2271,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/users/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/users/org/{orgId}");
         });
     }
     /**
@@ -2589,7 +2279,7 @@ class Query {
      *
      * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ListUsersPaypointRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2608,30 +2298,33 @@ class Query {
     }
     __listUsersPaypoint(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/users/point/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/users/point/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2654,21 +2347,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/users/point/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/users/point/{entry}");
         });
     }
     /**
@@ -2676,7 +2355,7 @@ class Query {
      *
      * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ListVendorsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2695,33 +2374,36 @@ class Query {
     }
     __listVendors(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vendors/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vendors/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2744,21 +2426,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/vendors/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/vendors/{entry}");
         });
     }
     /**
@@ -2766,7 +2434,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListVendorsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2785,33 +2453,36 @@ class Query {
     }
     __listVendorsOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vendors/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vendors/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2834,21 +2505,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/vendors/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/vendors/org/{orgId}");
         });
     }
     /**
@@ -2856,7 +2513,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListVcardsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2875,33 +2532,36 @@ class Query {
     }
     __listVcards(entry_1) {
         return __awaiter(this, arguments, void 0, function* (entry, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vcards/${encodeURIComponent(entry)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vcards/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2924,21 +2584,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/vcards/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/vcards/{entry}");
         });
     }
     /**
@@ -2946,7 +2592,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListVcardsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2965,33 +2611,36 @@ class Query {
     }
     __listVcardsOrg(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { exportFormat, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (exportFormat != null) {
-                _queryParams["exportFormat"] = exportFormat;
+                _queryParams.exportFormat = exportFormat;
             }
             if (fromRecord != null) {
-                _queryParams["fromRecord"] = fromRecord.toString();
+                _queryParams.fromRecord = fromRecord.toString();
             }
             if (limitRecord != null) {
-                _queryParams["limitRecord"] = limitRecord.toString();
+                _queryParams.limitRecord = limitRecord.toString();
             }
             if (parameters != null) {
-                _queryParams["parameters"] = (0, json_js_1.toJson)(parameters);
+                _queryParams.parameters = (0, json_js_1.toJson)(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vcards/org/${encodeURIComponent(orgId)}`),
+                url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vcards/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -3014,28 +2663,8 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/vcards/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
-        });
-    }
-    _getCustomAuthorizationHeaders() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const apiKeyValue = yield core.Supplier.get(this._options.apiKey);
-            return { requestToken: apiKeyValue };
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/vcards/org/{orgId}");
         });
     }
 }
-exports.Query = Query;
+exports.QueryClient = QueryClient;