@payabli/sdk-node 0.0.116 → 0.0.123

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

@@ -8,19 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.mjs";
+import { normalizeClientOptionsWithAuth } from "../../../../BaseClient.mjs";
+import { mergeHeaders } from "../../../../core/headers.mjs";
 import * as core from "../../../../core/index.mjs";
 import * as environments from "../../../../environments.mjs";
+import { handleNonStatusCodeError } from "../../../../errors/handleNonStatusCodeError.mjs";
 import * as errors from "../../../../errors/index.mjs";
 import * as Payabli from "../../../index.mjs";
-export class Ocr {
-    constructor(_options = {}) {
-        this._options = _options;
+export class OcrClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     /**
+     * Use this endpoint to upload an image file for OCR processing. The accepted file formats include PDF, JPG, JPEG, PNG, and GIF. Specify the desired type of result (either 'bill' or 'invoice') in the path parameter `typeResult`. The response will contain the OCR processing results, including extracted data such as bill number, vendor information, bill items, and more.
+     *
      * @param {Payabli.TypeResult} typeResult
      * @param {Payabli.FileContentImageOnly} request
-     * @param {Ocr.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OcrClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -36,7 +40,8 @@ export class Ocr {
     __ocrDocumentForm(typeResult, request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _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, `/Import/ocrDocumentForm/${core.url.encodePathParam(typeResult)}`),
                 method: "POST",
@@ -72,27 +77,15 @@ export class Ocr {
                         });
                 }
             }
-            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 POST /Import/ocrDocumentForm/{typeResult}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/Import/ocrDocumentForm/{typeResult}");
         });
     }
     /**
+     * Use this endpoint to submit a Base64-encoded image file for OCR processing. The accepted file formats include PDF, JPG, JPEG, PNG, and GIF. Specify the desired type of result (either 'bill' or 'invoice') in the path parameter `typeResult`. The response will contain the OCR processing results, including extracted data such as bill number, vendor information, bill items, and more.
+     *
      * @param {Payabli.TypeResult} typeResult
      * @param {Payabli.FileContentImageOnly} request
-     * @param {Ocr.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OcrClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -108,7 +101,8 @@ export class Ocr {
     __ocrDocumentJson(typeResult, request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _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, `/Import/ocrDocumentJson/${core.url.encodePathParam(typeResult)}`),
                 method: "POST",
@@ -144,27 +138,7 @@ export class Ocr {
                         });
                 }
             }
-            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 POST /Import/ocrDocumentJson/{typeResult}.");
-                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, "POST", "/Import/ocrDocumentJson/{typeResult}");
         });
     }
 }

package/dist/esm/api/resources/organization/client/Client.d.mts

@@ -1,20 +1,20 @@
 import type { BaseClientOptions, BaseRequestOptions } from "../../../../BaseClient.mjs";
+import { type NormalizedClientOptionsWithAuth } from "../../../../BaseClient.mjs";
 import * as core from "../../../../core/index.mjs";
 import * as Payabli from "../../../index.mjs";
-export declare namespace Organization {
-    interface Options extends BaseClientOptions {
-    }
+export declare namespace OrganizationClient {
+    type Options = BaseClientOptions;
     interface RequestOptions extends BaseRequestOptions {
     }
 }
-export declare class Organization {
-    protected readonly _options: Organization.Options;
-    constructor(_options?: Organization.Options);
+export declare class OrganizationClient {
+    protected readonly _options: NormalizedClientOptionsWithAuth<OrganizationClient.Options>;
+    constructor(options?: OrganizationClient.Options);
     /**
      * Creates an organization under a parent organization. This is also referred to as a suborganization.
      *
      * @param {Payabli.AddOrganizationRequest} request
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -62,13 +62,13 @@ export declare class Organization {
      *         replyToEmail: "email@example.com"
      *     })
      */
-    addOrganization(request: Payabli.AddOrganizationRequest, requestOptions?: Organization.RequestOptions): core.HttpResponsePromise<Payabli.AddOrganizationResponse>;
+    addOrganization(request: Payabli.AddOrganizationRequest, requestOptions?: OrganizationClient.RequestOptions): core.HttpResponsePromise<Payabli.AddOrganizationResponse>;
     private __addOrganization;
     /**
      * Delete an organization by ID.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -78,14 +78,14 @@ export declare class Organization {
      * @example
      *     await client.organization.deleteOrganization(123)
      */
-    deleteOrganization(orgId: number, requestOptions?: Organization.RequestOptions): core.HttpResponsePromise<Payabli.DeleteOrganizationResponse>;
+    deleteOrganization(orgId: number, requestOptions?: OrganizationClient.RequestOptions): core.HttpResponsePromise<Payabli.DeleteOrganizationResponse>;
     private __deleteOrganization;
     /**
      * Updates an organization's details by ID.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.OrganizationData} request
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -113,13 +113,13 @@ export declare class Organization {
      *         orgZip: "37615"
      *     })
      */
-    editOrganization(orgId: number, request?: Payabli.OrganizationData, requestOptions?: Organization.RequestOptions): core.HttpResponsePromise<Payabli.EditOrganizationResponse>;
+    editOrganization(orgId: number, request?: Payabli.OrganizationData, requestOptions?: OrganizationClient.RequestOptions): core.HttpResponsePromise<Payabli.EditOrganizationResponse>;
     private __editOrganization;
     /**
      * Gets an organization's basic information by entry name (entrypoint identifier).
      *
      * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -129,13 +129,13 @@ export declare class Organization {
      * @example
      *     await client.organization.getBasicOrganization("8cfec329267")
      */
-    getBasicOrganization(entry: string, requestOptions?: Organization.RequestOptions): core.HttpResponsePromise<Payabli.OrganizationQueryRecord>;
+    getBasicOrganization(entry: string, requestOptions?: OrganizationClient.RequestOptions): core.HttpResponsePromise<Payabli.OrganizationQueryRecord>;
     private __getBasicOrganization;
     /**
      * Gets an organizations basic details by org ID.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -145,13 +145,13 @@ export declare class Organization {
      * @example
      *     await client.organization.getBasicOrganizationById(123)
      */
-    getBasicOrganizationById(orgId: number, requestOptions?: Organization.RequestOptions): core.HttpResponsePromise<Payabli.OrganizationQueryRecord>;
+    getBasicOrganizationById(orgId: number, requestOptions?: OrganizationClient.RequestOptions): core.HttpResponsePromise<Payabli.OrganizationQueryRecord>;
     private __getBasicOrganizationById;
     /**
      * Retrieves details for an organization by ID.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -161,13 +161,13 @@ export declare class Organization {
      * @example
      *     await client.organization.getOrganization(123)
      */
-    getOrganization(orgId: number, requestOptions?: Organization.RequestOptions): core.HttpResponsePromise<Payabli.OrganizationQueryRecord>;
+    getOrganization(orgId: number, requestOptions?: OrganizationClient.RequestOptions): core.HttpResponsePromise<Payabli.OrganizationQueryRecord>;
     private __getOrganization;
     /**
      * Retrieves an organization's settings.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -177,7 +177,6 @@ export declare class Organization {
      * @example
      *     await client.organization.getSettingsOrganization(123)
      */
-    getSettingsOrganization(orgId: number, requestOptions?: Organization.RequestOptions): core.HttpResponsePromise<Payabli.SettingsQueryRecord>;
+    getSettingsOrganization(orgId: number, requestOptions?: OrganizationClient.RequestOptions): core.HttpResponsePromise<Payabli.SettingsQueryRecord>;
     private __getSettingsOrganization;
-    protected _getCustomAuthorizationHeaders(): Promise<Record<string, string | undefined>>;
 }

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

@@ -19,20 +19,22 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+import { normalizeClientOptionsWithAuth } from "../../../../BaseClient.mjs";
 import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.mjs";
 import * as core from "../../../../core/index.mjs";
 import * as environments from "../../../../environments.mjs";
+import { handleNonStatusCodeError } from "../../../../errors/handleNonStatusCodeError.mjs";
 import * as errors from "../../../../errors/index.mjs";
 import * as Payabli from "../../../index.mjs";
-export class Organization {
-    constructor(_options = {}) {
-        this._options = _options;
+export class OrganizationClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     /**
      * Creates an organization under a parent organization. This is also referred to as a suborganization.
      *
      * @param {Payabli.AddOrganizationRequest} request
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -87,7 +89,8 @@ export class Organization {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { idempotencyKey } = request, _body = __rest(request, ["idempotencyKey"]);
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({ idempotencyKey: idempotencyKey != null ? idempotencyKey : undefined }, (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, mergeOnlyDefinedHeaders({ idempotencyKey: idempotencyKey != null ? idempotencyKey : undefined }), 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, "Organization"),
                 method: "POST",
@@ -123,28 +126,14 @@ export class Organization {
                         });
                 }
             }
-            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 POST /Organization.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/Organization");
         });
     }
     /**
      * Delete an organization by ID.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -160,7 +149,8 @@ export class Organization {
     __deleteOrganization(orgId, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _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, `Organization/${core.url.encodePathParam(orgId)}`),
                 method: "DELETE",
@@ -193,21 +183,7 @@ export class Organization {
                         });
                 }
             }
-            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 DELETE /Organization/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "DELETE", "/Organization/{orgId}");
         });
     }
     /**
@@ -215,7 +191,7 @@ export class Organization {
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
      * @param {Payabli.OrganizationData} request
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -249,7 +225,8 @@ export class Organization {
     __editOrganization(orgId_1) {
         return __awaiter(this, arguments, void 0, function* (orgId, request = {}, requestOptions) {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _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, `Organization/${core.url.encodePathParam(orgId)}`),
                 method: "PUT",
@@ -285,28 +262,14 @@ export class Organization {
                         });
                 }
             }
-            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 PUT /Organization/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "PUT", "/Organization/{orgId}");
         });
     }
     /**
      * Gets an organization's basic information by entry name (entrypoint identifier).
      *
      * @param {string} entry - The paypoint's entrypoint identifier. [Learn more](/api-reference/api-overview#entrypoint-vs-entry)
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -322,7 +285,8 @@ export class Organization {
     __getBasicOrganization(entry, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _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, `Organization/basic/${core.url.encodePathParam(entry)}`),
                 method: "GET",
@@ -355,28 +319,14 @@ export class Organization {
                         });
                 }
             }
-            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 /Organization/basic/{entry}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Organization/basic/{entry}");
         });
     }
     /**
      * Gets an organizations basic details by org ID.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -392,7 +342,8 @@ export class Organization {
     __getBasicOrganizationById(orgId, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _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, `Organization/basicById/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -425,28 +376,14 @@ export class Organization {
                         });
                 }
             }
-            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 /Organization/basicById/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Organization/basicById/{orgId}");
         });
     }
     /**
      * Retrieves details for an organization by ID.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -462,7 +399,8 @@ export class Organization {
     __getOrganization(orgId, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _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, `Organization/read/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -495,28 +433,14 @@ export class Organization {
                         });
                 }
             }
-            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 /Organization/read/{orgId}.");
-                case "unknown":
-                    throw new errors.PayabliError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/Organization/read/{orgId}");
         });
     }
     /**
      * Retrieves an organization's settings.
      *
      * @param {number} orgId - The numeric identifier for organization, assigned by Payabli.
-     * @param {Organization.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {OrganizationClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Payabli.BadRequestError}
      * @throws {@link Payabli.UnauthorizedError}
@@ -532,7 +456,8 @@ export class Organization {
     __getSettingsOrganization(orgId, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _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, `Organization/settings/${core.url.encodePathParam(orgId)}`),
                 method: "GET",
@@ -565,27 +490,7 @@ export class Organization {
                         });
                 }
             }
-            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 /Organization/settings/{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", "/Organization/settings/{orgId}");
         });
     }
 }