@payabli/sdk-node 0.0.114 → 0.0.117

package/dist/esm/api/resources/query/client/Client.mjs

@@ -1,6 +1,4 @@
-/**
- * This file was auto-generated by Fern from our API Definition.
- */
+// This file was auto-generated by Fern from our API Definition.
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,15 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import * as environments from "../../../../environments.mjs";
+import { normalizeClientOptionsWithAuth } from "../../../../BaseClient.mjs";
+import { mergeHeaders } from "../../../../core/headers.mjs";
 import * as core from "../../../../core/index.mjs";
-import * as Payabli from "../../../index.mjs";
 import { toJson } from "../../../../core/json.mjs";
-import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.mjs";
+import * as environments from "../../../../environments.mjs";
+import { handleNonStatusCodeError } from "../../../../errors/handleNonStatusCodeError.mjs";
 import * as errors from "../../../../errors/index.mjs";
-export class Query {
-    constructor(_options = {}) {
-        this._options = _options;
+import * as Payabli from "../../../index.mjs";
+export class QueryClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     /**
      * Retrieve a list of batches and their details, including settled and
@@ -26,7 +26,7 @@ export 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}
@@ -45,33 +45,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -94,21 +97,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/batchDetails/{entry}");
         });
     }
     /**
@@ -116,7 +105,7 @@ export 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}
@@ -135,33 +124,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -184,21 +176,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/batchDetails/org/{orgId}");
         });
     }
     /**
@@ -206,7 +184,7 @@ export 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}
@@ -225,33 +203,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -274,21 +255,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/batches/{entry}");
         });
     }
     /**
@@ -296,7 +263,7 @@ export 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}
@@ -315,33 +282,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -364,21 +334,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/batches/org/{orgId}");
         });
     }
     /**
@@ -386,7 +342,7 @@ export 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}
@@ -405,33 +361,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -454,21 +413,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/batchesOut/{entry}");
         });
     }
     /**
@@ -476,7 +421,7 @@ export 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}
@@ -495,33 +440,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -544,21 +492,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/batchesOut/org/{orgId}");
         });
     }
     /**
@@ -566,7 +500,7 @@ export 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}
@@ -585,33 +519,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -634,21 +571,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/chargebacks/{entry}");
         });
     }
     /**
@@ -656,7 +579,7 @@ export 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}
@@ -675,33 +598,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -724,21 +650,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/chargebacks/org/{orgId}");
         });
     }
     /**
@@ -746,7 +658,7 @@ export 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}
@@ -765,33 +677,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -814,21 +729,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/customers/{entry}");
         });
     }
     /**
@@ -836,7 +737,7 @@ export 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}
@@ -855,33 +756,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -904,21 +808,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/customers/org/{orgId}");
         });
     }
     /**
@@ -926,7 +816,7 @@ export 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}
@@ -945,30 +835,33 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 {
@@ -994,21 +887,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/notificationReports/{entry}");
         });
     }
     /**
@@ -1016,7 +895,7 @@ export 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}
@@ -1035,30 +914,33 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 {
@@ -1084,21 +966,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/notificationReports/org/{orgId}");
         });
     }
     /**
@@ -1106,7 +974,7 @@ export 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}
@@ -1125,30 +993,33 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1171,21 +1042,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/notifications/{entry}");
         });
     }
     /**
@@ -1193,7 +1050,7 @@ export 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}
@@ -1212,30 +1069,33 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1258,21 +1118,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/notifications/org/{orgId}");
         });
     }
     /**
@@ -1280,7 +1126,7 @@ export 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}
@@ -1299,33 +1145,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1348,21 +1197,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/organizations/{orgId}");
         });
     }
     /**
@@ -1370,7 +1205,7 @@ export 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}
@@ -1389,33 +1224,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1438,21 +1276,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/payouts/{entry}");
         });
     }
     /**
@@ -1460,7 +1284,7 @@ export 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}
@@ -1479,33 +1303,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1528,21 +1355,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/payouts/org/{orgId}");
         });
     }
     /**
@@ -1550,7 +1363,7 @@ export 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}
@@ -1569,33 +1382,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1618,21 +1434,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/paypoints/{orgId}");
         });
     }
     /**
@@ -1640,7 +1442,7 @@ export 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}
@@ -1659,33 +1461,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1708,21 +1513,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/settlements/{entry}");
         });
     }
     /**
@@ -1730,7 +1521,7 @@ export 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}
@@ -1749,33 +1540,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1798,21 +1592,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/settlements/org/{orgId}");
         });
     }
     /**
@@ -1820,7 +1600,7 @@ export 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}
@@ -1839,33 +1619,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1888,21 +1671,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/subscriptions/{entry}");
         });
     }
     /**
@@ -1910,7 +1679,7 @@ export 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}
@@ -1929,33 +1698,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -1978,21 +1750,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/subscriptions/org/{orgId}");
         });
     }
     /**
@@ -2007,7 +1765,7 @@ export 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}
@@ -2026,33 +1784,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2075,21 +1836,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/transactions/{entry}");
         });
     }
     /**
@@ -2111,7 +1858,7 @@ export 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}
@@ -2130,33 +1877,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2179,21 +1929,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/transactions/org/{orgId}");
         });
     }
     /**
@@ -2202,7 +1938,7 @@ export 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}
@@ -2217,33 +1953,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2266,21 +2005,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/transferDetails/{entry}/{transferId}");
         });
     }
     /**
@@ -2288,7 +2013,7 @@ export 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}
@@ -2306,33 +2031,35 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _headers = 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 };
@@ -2355,28 +2082,14 @@ export 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 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}
@@ -2395,33 +2108,35 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _headers = 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 };
@@ -2444,21 +2159,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/transfers/org/{orgId}");
         });
     }
     /**
@@ -2466,7 +2167,7 @@ export 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}
@@ -2485,30 +2186,33 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2531,21 +2235,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/users/org/{orgId}");
         });
     }
     /**
@@ -2553,7 +2243,7 @@ export 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}
@@ -2572,30 +2262,33 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2618,21 +2311,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/users/point/{entry}");
         });
     }
     /**
@@ -2640,7 +2319,7 @@ export 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}
@@ -2659,33 +2338,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2708,21 +2390,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/vendors/{entry}");
         });
     }
     /**
@@ -2730,7 +2398,7 @@ export 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}
@@ -2749,33 +2417,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2798,21 +2469,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/vendors/org/{orgId}");
         });
     }
     /**
@@ -2820,7 +2477,7 @@ export 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}
@@ -2839,33 +2496,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2888,21 +2548,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/vcards/{entry}");
         });
     }
     /**
@@ -2910,7 +2556,7 @@ export 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}
@@ -2929,33 +2575,36 @@ export 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"] = toJson(parameters);
+                _queryParams.parameters = toJson(parameters);
             }
             if (sortBy != null) {
-                _queryParams["sortBy"] = sortBy;
+                _queryParams.sortBy = sortBy;
             }
-            let _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = 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 };
@@ -2978,27 +2627,7 @@ export 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 handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Query/vcards/org/{orgId}");
         });
     }
 }