@payabli/sdk-node 0.0.114 → 0.0.117

package/dist/esm/api/resources/export/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 Export {
-    constructor(_options = {}) {
-        this._options = _options;
+import * as Payabli from "../../../index.mjs";
+export class ExportClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     /**
      * Export a list of boarding applications for an organization. Use filters to limit results.
@@ -26,7 +26,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportApplicationsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -45,30 +45,33 @@ export class Export {
     }
     __exportApplications(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/boarding/${encodeURIComponent(format)}/${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, `Export/boarding/${core.url.encodePathParam(format)}/${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 };
@@ -91,28 +94,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/boarding/{format}/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/boarding/{format}/{orgId}");
         });
     }
     /**
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
+     * This endpoint is deprecated. Export batch details for a paypoint. Use filters to limit results.
+     *
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportBatchDetailsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -120,41 +111,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportBatchDetails("8cfec329267", "csv", {
+     *     await client.export.exportBatchDetails("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportBatchDetails(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportBatchDetails(entry, format, request, requestOptions));
+    exportBatchDetails(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportBatchDetails(format, entry, request, requestOptions));
     }
-    __exportBatchDetails(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportBatchDetails(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/batchDetails/${encodeURIComponent(format)}/${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, `Export/batchDetails/${core.url.encodePathParam(format)}/${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 };
@@ -177,28 +171,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/batchDetails/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/batchDetails/{format}/{entry}");
         });
     }
     /**
+     * This endpoint is deprecated. Export batch details for an organization. Use filters to limit results.
+     *
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportBatchDetailsOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -217,30 +199,33 @@ export class Export {
     }
     __exportBatchDetailsOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/batchDetails/${encodeURIComponent(format)}/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, `Export/batchDetails/${core.url.encodePathParam(format)}/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 };
@@ -263,30 +248,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/batchDetails/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/batchDetails/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of batches for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportBatchesRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -294,41 +265,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportBatches("8cfec329267", "csv", {
+     *     await client.export.exportBatches("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportBatches(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportBatches(entry, format, request, requestOptions));
+    exportBatches(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportBatches(format, entry, request, requestOptions));
     }
-    __exportBatches(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportBatches(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/batches/${encodeURIComponent(format)}/${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, `Export/batches/${core.url.encodePathParam(format)}/${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 };
@@ -351,21 +325,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/batches/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/batches/{format}/{entry}");
         });
     }
     /**
@@ -374,7 +334,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportBatchesOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -393,30 +353,33 @@ export class Export {
     }
     __exportBatchesOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/batches/${encodeURIComponent(format)}/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, `Export/batches/${core.url.encodePathParam(format)}/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 };
@@ -439,30 +402,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/batches/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/batches/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of money out batches for a paypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportBatchesOutRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -470,41 +419,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportBatchesOut("8cfec329267", "csv", {
+     *     await client.export.exportBatchesOut("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportBatchesOut(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportBatchesOut(entry, format, request, requestOptions));
+    exportBatchesOut(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportBatchesOut(format, entry, request, requestOptions));
     }
-    __exportBatchesOut(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportBatchesOut(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/batchesOut/${encodeURIComponent(format)}/${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, `Export/batchesOut/${core.url.encodePathParam(format)}/${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 };
@@ -527,21 +479,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/batchesOut/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/batchesOut/{format}/{entry}");
         });
     }
     /**
@@ -550,7 +488,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportBatchesOutOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -569,30 +507,33 @@ export class Export {
     }
     __exportBatchesOutOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/batchesOut/${encodeURIComponent(format)}/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, `Export/batchesOut/${core.url.encodePathParam(format)}/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 };
@@ -615,30 +556,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/batchesOut/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/batchesOut/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of bills for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportBillsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -646,41 +573,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportBills("8cfec329267", "csv", {
+     *     await client.export.exportBills("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportBills(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportBills(entry, format, request, requestOptions));
+    exportBills(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportBills(format, entry, request, requestOptions));
     }
-    __exportBills(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportBills(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/bills/${encodeURIComponent(format)}/${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, `Export/bills/${core.url.encodePathParam(format)}/${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 };
@@ -703,21 +633,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/bills/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/bills/{format}/{entry}");
         });
     }
     /**
@@ -726,7 +642,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportBillsOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -745,30 +661,33 @@ export class Export {
     }
     __exportBillsOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/bills/${encodeURIComponent(format)}/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, `Export/bills/${core.url.encodePathParam(format)}/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 };
@@ -791,30 +710,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/bills/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/bills/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of chargebacks and ACH returns for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportChargebacksRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -822,41 +727,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportChargebacks("8cfec329267", "csv", {
+     *     await client.export.exportChargebacks("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportChargebacks(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportChargebacks(entry, format, request, requestOptions));
+    exportChargebacks(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportChargebacks(format, entry, request, requestOptions));
     }
-    __exportChargebacks(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportChargebacks(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/chargebacks/${encodeURIComponent(format)}/${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, `Export/chargebacks/${core.url.encodePathParam(format)}/${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 };
@@ -879,21 +787,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/chargebacks/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/chargebacks/{format}/{entry}");
         });
     }
     /**
@@ -902,7 +796,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportChargebacksOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -921,30 +815,33 @@ export class Export {
     }
     __exportChargebacksOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/chargebacks/${encodeURIComponent(format)}/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, `Export/chargebacks/${core.url.encodePathParam(format)}/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 };
@@ -967,30 +864,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/chargebacks/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/chargebacks/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of customers for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportCustomersRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -998,41 +881,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportCustomers("8cfec329267", "csv", {
+     *     await client.export.exportCustomers("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportCustomers(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportCustomers(entry, format, request, requestOptions));
+    exportCustomers(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportCustomers(format, entry, request, requestOptions));
     }
-    __exportCustomers(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportCustomers(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/customers/${encodeURIComponent(format)}/${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, `Export/customers/${core.url.encodePathParam(format)}/${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 };
@@ -1055,21 +941,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/customers/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/customers/{format}/{entry}");
         });
     }
     /**
@@ -1078,7 +950,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportCustomersOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1097,30 +969,33 @@ export class Export {
     }
     __exportCustomersOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/customers/${encodeURIComponent(format)}/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, `Export/customers/${core.url.encodePathParam(format)}/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 };
@@ -1143,30 +1018,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/customers/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/customers/{format}/org/{orgId}");
         });
     }
     /**
      * Export list of invoices for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportInvoicesRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1174,41 +1035,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportInvoices("8cfec329267", "csv", {
+     *     await client.export.exportInvoices("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportInvoices(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportInvoices(entry, format, request, requestOptions));
+    exportInvoices(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportInvoices(format, entry, request, requestOptions));
     }
-    __exportInvoices(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportInvoices(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/invoices/${encodeURIComponent(format)}/${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, `Export/invoices/${core.url.encodePathParam(format)}/${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 };
@@ -1231,21 +1095,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/invoices/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/invoices/{format}/{entry}");
         });
     }
     /**
@@ -1254,7 +1104,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportInvoicesOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1273,30 +1123,33 @@ export class Export {
     }
     __exportInvoicesOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/invoices/${encodeURIComponent(format)}/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, `Export/invoices/${core.url.encodePathParam(format)}/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 };
@@ -1319,21 +1172,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/invoices/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/invoices/{format}/org/{orgId}");
         });
     }
     /**
@@ -1342,7 +1181,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportOrganizationsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1361,30 +1200,33 @@ export class Export {
     }
     __exportOrganizations(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/organizations/${encodeURIComponent(format)}/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, `Export/organizations/${core.url.encodePathParam(format)}/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 };
@@ -1407,30 +1249,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/organizations/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/organizations/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of payouts and their statuses for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportPayoutRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1438,41 +1266,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportPayout("8cfec329267", "csv", {
+     *     await client.export.exportPayout("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportPayout(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportPayout(entry, format, request, requestOptions));
+    exportPayout(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportPayout(format, entry, request, requestOptions));
     }
-    __exportPayout(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportPayout(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/payouts/${encodeURIComponent(format)}/${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, `Export/payouts/${core.url.encodePathParam(format)}/${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 };
@@ -1495,21 +1326,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/payouts/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/payouts/{format}/{entry}");
         });
     }
     /**
@@ -1518,7 +1335,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportPayoutOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1537,30 +1354,33 @@ export class Export {
     }
     __exportPayoutOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/payouts/${encodeURIComponent(format)}/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, `Export/payouts/${core.url.encodePathParam(format)}/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 };
@@ -1583,21 +1403,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/payouts/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/payouts/{format}/org/{orgId}");
         });
     }
     /**
@@ -1606,7 +1412,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportPaypointsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1625,30 +1431,33 @@ export class Export {
     }
     __exportPaypoints(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/paypoints/${encodeURIComponent(format)}/${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, `Export/paypoints/${core.url.encodePathParam(format)}/${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 };
@@ -1671,30 +1480,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/paypoints/{format}/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/paypoints/{format}/{orgId}");
         });
     }
     /**
      * Export a list of settled transactions for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportSettlementsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1702,41 +1497,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportSettlements("8cfec329267", "csv", {
+     *     await client.export.exportSettlements("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportSettlements(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportSettlements(entry, format, request, requestOptions));
+    exportSettlements(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportSettlements(format, entry, request, requestOptions));
     }
-    __exportSettlements(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportSettlements(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/settlements/${encodeURIComponent(format)}/${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, `Export/settlements/${core.url.encodePathParam(format)}/${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 };
@@ -1759,21 +1557,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/settlements/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/settlements/{format}/{entry}");
         });
     }
     /**
@@ -1782,7 +1566,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportSettlementsOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1801,30 +1585,33 @@ export class Export {
     }
     __exportSettlementsOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/settlements/${encodeURIComponent(format)}/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, `Export/settlements/${core.url.encodePathParam(format)}/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 };
@@ -1847,30 +1634,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/settlements/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/settlements/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of subscriptions for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportSubscriptionsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1878,41 +1651,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportSubscriptions("8cfec329267", "csv", {
+     *     await client.export.exportSubscriptions("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportSubscriptions(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportSubscriptions(entry, format, request, requestOptions));
+    exportSubscriptions(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportSubscriptions(format, entry, request, requestOptions));
     }
-    __exportSubscriptions(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportSubscriptions(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/subscriptions/${encodeURIComponent(format)}/${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, `Export/subscriptions/${core.url.encodePathParam(format)}/${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 };
@@ -1935,21 +1711,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/subscriptions/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/subscriptions/{format}/{entry}");
         });
     }
     /**
@@ -1958,7 +1720,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportSubscriptionsOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -1977,30 +1739,33 @@ export class Export {
     }
     __exportSubscriptionsOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/subscriptions/${encodeURIComponent(format)}/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, `Export/subscriptions/${core.url.encodePathParam(format)}/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 };
@@ -2023,30 +1788,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/subscriptions/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/subscriptions/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of transactions for an entrypoint in a file in XLXS or CSV format. Use filters to limit results. If you don't specify a date range in the request, the last two months of data are returned.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportTransactionsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2054,41 +1805,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportTransactions("8cfec329267", "csv", {
+     *     await client.export.exportTransactions("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportTransactions(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportTransactions(entry, format, request, requestOptions));
+    exportTransactions(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportTransactions(format, entry, request, requestOptions));
     }
-    __exportTransactions(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportTransactions(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/transactions/${encodeURIComponent(format)}/${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, `Export/transactions/${core.url.encodePathParam(format)}/${core.url.encodePathParam(entry)}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
+                maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -2111,21 +1865,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/transactions/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/transactions/{format}/{entry}");
         });
     }
     /**
@@ -2134,7 +1874,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportTransactionsOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2153,30 +1893,33 @@ export class Export {
     }
     __exportTransactionsOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/transactions/${encodeURIComponent(format)}/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, `Export/transactions/${core.url.encodePathParam(format)}/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 };
@@ -2199,31 +1942,17 @@ export class Export {
                         });
                 }
             }
-            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 /Export/transactions/{format}/org/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/transactions/{format}/org/{orgId}");
         });
     }
     /**
      * Export a list of transfer details for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {number} transferId - Transfer identifier.
      * @param {Payabli.ExportTransferDetailsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2231,45 +1960,48 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportTransferDetails("8cfec329267", "csv", 1000000, {
+     *     await client.export.exportTransferDetails("csv", "8cfec329267", 1000000, {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000,
      *         sortBy: "desc(field_name)"
      *     })
      */
-    exportTransferDetails(entry, format, transferId, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportTransferDetails(entry, format, transferId, request, requestOptions));
+    exportTransferDetails(format, entry, transferId, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportTransferDetails(format, entry, transferId, request, requestOptions));
     }
-    __exportTransferDetails(entry_1, format_1, transferId_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, transferId, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportTransferDetails(format_1, entry_1, transferId_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, transferId, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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, `Export/transferDetails/${encodeURIComponent(format)}/${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, `Export/transferDetails/${core.url.encodePathParam(format)}/${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 };
@@ -2292,21 +2024,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/transferDetails/{format}/{entry}/{transferId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/transferDetails/{format}/{entry}/{transferId}");
         });
     }
     /**
@@ -2314,7 +2032,7 @@ export class Export {
      *
      * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportTransfersRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2334,33 +2052,36 @@ export class Export {
     }
     __exportTransfers(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 { columnsExport, fromRecord, limitRecord, parameters, sortBy } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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, `Export/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, `Export/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 };
@@ -2383,30 +2104,16 @@ export class Export {
                         });
                 }
             }
-            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 /Export/transfers/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/transfers/{entry}");
         });
     }
     /**
      * Export a list of vendors for an entrypoint. Use filters to limit results.
      *
-     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
+     * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
      * @param {Payabli.ExportVendorsRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2414,41 +2121,44 @@ export class Export {
      * @throws {@link Payabli.ServiceUnavailableError}
      *
      * @example
-     *     await client.export.exportVendors("8cfec329267", "csv", {
+     *     await client.export.exportVendors("csv", "8cfec329267", {
      *         columnsExport: "BatchDate:Batch_Date,PaypointName:Legal_name",
      *         fromRecord: 251,
      *         limitRecord: 1000
      *     })
      */
-    exportVendors(entry, format, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__exportVendors(entry, format, request, requestOptions));
+    exportVendors(format, entry, request = {}, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__exportVendors(format, entry, request, requestOptions));
     }
-    __exportVendors(entry_1, format_1) {
-        return __awaiter(this, arguments, void 0, function* (entry, format, request = {}, requestOptions) {
-            var _a, _b, _c;
+    __exportVendors(format_1, entry_1) {
+        return __awaiter(this, arguments, void 0, function* (format, entry, request = {}, requestOptions) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/vendors/${encodeURIComponent(format)}/${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, `Export/vendors/${core.url.encodePathParam(format)}/${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 };
@@ -2471,21 +2181,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/vendors/{format}/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Export/vendors/{format}/{entry}");
         });
     }
     /**
@@ -2494,7 +2190,7 @@ export class Export {
      * @param {Payabli.ExportFormat1} format - Format for the export, either XLSX or CSV.
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.ExportVendorsOrgRequest} request
-     * @param {Export.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ExportClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -2513,30 +2209,33 @@ export class Export {
     }
     __exportVendorsOrg(format_1, orgId_1) {
         return __awaiter(this, arguments, void 0, function* (format, orgId, request = {}, requestOptions) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { columnsExport, fromRecord, limitRecord, parameters } = request;
             const _queryParams = {};
             if (columnsExport != null) {
-                _queryParams["columnsExport"] = columnsExport;
+                _queryParams.columnsExport = columnsExport;
             }
             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);
             }
-            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, `Export/vendors/${encodeURIComponent(format)}/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, `Export/vendors/${core.url.encodePathParam(format)}/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 };
@@ -2559,27 +2258,7 @@ export class Export {
                         });
                 }
             }
-            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 /Export/vendors/{format}/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", "/Export/vendors/{format}/org/{orgId}");
         });
     }
 }