@payabli/sdk-node 0.0.116 → 0.0.123

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

@@ -43,16 +43,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Query = void 0;
+exports.QueryClient = void 0;
+const BaseClient_js_1 = require("../../../../BaseClient.js");
 const headers_js_1 = require("../../../../core/headers.js");
 const core = __importStar(require("../../../../core/index.js"));
 const json_js_1 = require("../../../../core/json.js");
 const environments = __importStar(require("../../../../environments.js"));
+const handleNonStatusCodeError_js_1 = require("../../../../errors/handleNonStatusCodeError.js");
 const errors = __importStar(require("../../../../errors/index.js"));
 const Payabli = __importStar(require("../../../index.js"));
-class Query {
-    constructor(_options = {}) {
-        this._options = _options;
+class QueryClient {
+    constructor(options = {}) {
+        this._options = (0, BaseClient_js_1.normalizeClientOptionsWithAuth)(options);
     }
     /**
      * Retrieve a list of batches and their details, including settled and
@@ -60,7 +62,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListBatchDetailsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -97,7 +99,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchDetails/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -130,21 +133,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batchDetails/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batchDetails/{entry}");
         });
     }
     /**
@@ -152,7 +141,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListBatchDetailsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -189,7 +178,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchDetails/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -222,21 +212,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batchDetails/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batchDetails/org/{orgId}");
         });
     }
     /**
@@ -244,7 +220,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListBatchesRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -281,7 +257,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batches/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -314,21 +291,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batches/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batches/{entry}");
         });
     }
     /**
@@ -336,7 +299,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListBatchesOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -373,7 +336,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batches/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -406,21 +370,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batches/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batches/org/{orgId}");
         });
     }
     /**
@@ -428,7 +378,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListBatchesOutRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -465,7 +415,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchesOut/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -498,21 +449,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batchesOut/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batchesOut/{entry}");
         });
     }
     /**
@@ -520,7 +457,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListBatchesOutOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -557,7 +494,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/batchesOut/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -590,21 +528,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/batchesOut/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/batchesOut/org/{orgId}");
         });
     }
     /**
@@ -612,7 +536,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListChargebacksRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -649,7 +573,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/chargebacks/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -682,21 +607,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/chargebacks/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/chargebacks/{entry}");
         });
     }
     /**
@@ -704,7 +615,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListChargebacksOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -741,7 +652,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/chargebacks/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -774,21 +686,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/chargebacks/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/chargebacks/org/{orgId}");
         });
     }
     /**
@@ -796,7 +694,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListCustomersRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -833,7 +731,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/customers/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -866,21 +765,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/customers/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/customers/{entry}");
         });
     }
     /**
@@ -888,7 +773,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListCustomersOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -925,7 +810,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/customers/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -958,21 +844,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/customers/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/customers/org/{orgId}");
         });
     }
     /**
@@ -980,7 +852,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListNotificationReportsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1014,7 +886,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notificationReports/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -1050,21 +923,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/notificationReports/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/notificationReports/{entry}");
         });
     }
     /**
@@ -1072,7 +931,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListNotificationReportsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1106,7 +965,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notificationReports/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -1142,21 +1002,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/notificationReports/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/notificationReports/org/{orgId}");
         });
     }
     /**
@@ -1164,7 +1010,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListNotificationsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1198,7 +1044,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notifications/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -1231,21 +1078,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/notifications/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/notifications/{entry}");
         });
     }
     /**
@@ -1253,7 +1086,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListNotificationsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1287,7 +1120,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/notifications/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -1320,21 +1154,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/notifications/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/notifications/org/{orgId}");
         });
     }
     /**
@@ -1342,7 +1162,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListOrganizationsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1379,7 +1199,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/organizations/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -1412,21 +1233,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/organizations/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/organizations/{orgId}");
         });
     }
     /**
@@ -1434,7 +1241,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListPayoutRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1471,7 +1278,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/payouts/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -1504,21 +1312,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/payouts/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/payouts/{entry}");
         });
     }
     /**
@@ -1526,7 +1320,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListPayoutOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1563,7 +1357,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/payouts/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -1596,21 +1391,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/payouts/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/payouts/org/{orgId}");
         });
     }
     /**
@@ -1618,7 +1399,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListPaypointsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1655,7 +1436,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/paypoints/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -1688,21 +1470,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/paypoints/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/paypoints/{orgId}");
         });
     }
     /**
@@ -1710,7 +1478,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListSettlementsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1747,7 +1515,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/settlements/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -1780,21 +1549,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/settlements/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/settlements/{entry}");
         });
     }
     /**
@@ -1802,7 +1557,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListSettlementsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1839,7 +1594,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/settlements/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -1872,21 +1628,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/settlements/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/settlements/org/{orgId}");
         });
     }
     /**
@@ -1894,7 +1636,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListSubscriptionsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1931,7 +1673,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/subscriptions/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -1964,21 +1707,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/subscriptions/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/subscriptions/{entry}");
         });
     }
     /**
@@ -1986,7 +1715,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListSubscriptionsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2023,7 +1752,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/subscriptions/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -2056,21 +1786,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/subscriptions/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/subscriptions/org/{orgId}");
         });
     }
     /**
@@ -2085,7 +1801,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListTransactionsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2122,7 +1838,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transactions/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -2155,21 +1872,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transactions/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transactions/{entry}");
         });
     }
     /**
@@ -2191,7 +1894,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListTransactionsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2228,7 +1931,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transactions/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -2261,21 +1965,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transactions/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transactions/org/{orgId}");
         });
     }
     /**
@@ -2284,7 +1974,7 @@ class Query {
      * @param {Payabli.Entry} entry
      * @param {number} transferId - The numeric identifier for the transfer, assigned by Payabli.
      * @param {Payabli.ListTransfersPaypointRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2317,7 +2007,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transferDetails/${core.url.encodePathParam(entry)}/${core.url.encodePathParam(transferId)}`),
                 method: "GET",
@@ -2350,21 +2041,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transferDetails/{entry}/{transferId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transferDetails/{entry}/{transferId}");
         });
     }
     /**
@@ -2372,7 +2049,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListTransfersRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2408,7 +2085,7 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transfers/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -2441,28 +2118,14 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transfers/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transfers/{entry}");
         });
     }
     /**
      * Retrieve a list of transfers for an org. Use filters to limit results. Include the `exportFormat` query parameter to return the results as a file instead of a JSON response.
      *
      * @param {Payabli.ListTransfersRequestOrg} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2499,7 +2162,7 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/transfers/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -2532,21 +2195,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/transfers/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/transfers/org/{orgId}");
         });
     }
     /**
@@ -2554,7 +2203,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListUsersOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2588,7 +2237,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/users/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -2621,21 +2271,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/users/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/users/org/{orgId}");
         });
     }
     /**
@@ -2643,7 +2279,7 @@ class Query {
      *
      * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ListUsersPaypointRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2677,7 +2313,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/users/point/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -2710,21 +2347,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/users/point/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/users/point/{entry}");
         });
     }
     /**
@@ -2732,7 +2355,7 @@ class Query {
      *
      * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ListVendorsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2769,7 +2392,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vendors/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -2802,21 +2426,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/vendors/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/vendors/{entry}");
         });
     }
     /**
@@ -2824,7 +2434,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListVendorsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2861,7 +2471,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vendors/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -2894,21 +2505,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/vendors/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/vendors/org/{orgId}");
         });
     }
     /**
@@ -2916,7 +2513,7 @@ class Query {
      *
      * @param {Payabli.Entry} entry
      * @param {Payabli.ListVcardsRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2953,7 +2550,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vcards/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -2986,21 +2584,7 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/vcards/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/vcards/{entry}");
         });
     }
     /**
@@ -3008,7 +2592,7 @@ class Query {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ListVcardsOrgRequest} request
-     * @param {Query.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {QueryClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -3045,7 +2629,8 @@ class Query {
             if (sortBy != null) {
                 _queryParams.sortBy = sortBy;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PayabliEnvironment.Sandbox, `Query/vcards/org/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -3078,28 +2663,8 @@ class Query {
                         });
                 }
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.PayabliError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.PayabliTimeoutError("Timeout exceeded when calling GET /Query/vcards/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
-        });
-    }
-    _getCustomAuthorizationHeaders() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const apiKeyValue = yield core.Supplier.get(this._options.apiKey);
-            return { requestToken: apiKeyValue };
+            return (0, handleNonStatusCodeError_js_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/Query/vcards/org/{orgId}");
         });
     }
 }
-exports.Query = Query;
+exports.QueryClient = QueryClient;