lhisp-oauth-client 1.0.34 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lhisp-oauth-client",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "main": "src/index",
   "types": "src/index.d.ts",
   "repository": {
@@ -23,6 +23,6 @@
   },
   "dependencies": {
     "axios": "^1.10.0",
-    "lhisp-logger": "^1.0.16"
+    "lhisp-logger": "^2.2.2"
   }
 }

package/src/lhisp-oauth-client.d.ts

@@ -1,5 +1,5 @@
-import https from "https";
 import { AxiosHeaders } from "axios";
+import https from "https";
 import { AccessToken, ContentType, ExecutarRequestParams, LhispOauthClientConstructorParams } from "./lhisp-oauth-client.t";
 export declare class LhispOauthClient<iAccessToken extends AccessToken = AccessToken> {
     protected authUrl: string;
@@ -34,7 +34,7 @@ export declare class LhispOauthClient<iAccessToken extends AccessToken = AccessT
     getAccessToken(): Promise<iAccessToken>;
     buildAccessToken(data: any): iAccessToken;
     getAuthToken(): string;
-    executarRequest<ResponseType>({ method, path, data, params, contentType, headers, ...opt }: ExecutarRequestParams): Promise<ResponseType>;
+    executarRequest<ResponseType>({ method, path, data, params, contentType, headers: paramsHeaders, ...opt }: ExecutarRequestParams): Promise<ResponseType>;
     get<ResponseType>(opt: ExecutarRequestParams): Promise<ResponseType>;
     put<ResponseType>(opt: ExecutarRequestParams): Promise<ResponseType>;
     patch<ResponseType>(opt: ExecutarRequestParams): Promise<ResponseType>;

package/src/lhisp-oauth-client.js

@@ -24,11 +24,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LhispOauthClient = void 0;
-const querystring_1 = __importDefault(require("querystring"));
-const https_1 = __importDefault(require("https"));
 const axios_1 = __importDefault(require("axios"));
-const lhisp_oauth_client_t_1 = require("./lhisp-oauth-client.t");
+const https_1 = __importDefault(require("https"));
 const lhisp_logger_1 = __importDefault(require("lhisp-logger"));
+const querystring_1 = __importDefault(require("querystring"));
+const lhisp_oauth_client_t_1 = require("./lhisp-oauth-client.t");
+const logger = (0, lhisp_logger_1.default)({ name: "lhisp-oauth-client" });
 class LhispOauthClient {
     constructor(params) {
         this.authData = {};
@@ -118,7 +119,7 @@ class LhispOauthClient {
                 });
                 const resp = yield axios_1.default.request(authRequestOpt);
                 if (!(resp === null || resp === void 0 ? void 0 : resp.data)) {
-                    lhisp_logger_1.default.error({ message: "LhispOauthClient.getAccessToken", resp });
+                    logger.error({ message: "LhispOauthClient.getAccessToken", resp });
                     throw new Error("Resposta inválida ao obter token de acesso.");
                 }
                 this.accessToken = this.buildAccessToken(resp.data);
@@ -127,7 +128,7 @@ class LhispOauthClient {
                 return this.accessToken;
             }
             catch (error) {
-                lhisp_logger_1.default.error({ message: "LhispOauthClient.getAccessToken", error });
+                logger.error({ message: "LhispOauthClient.getAccessToken", error });
                 throw error;
             }
         });
@@ -147,16 +148,17 @@ class LhispOauthClient {
     }
     executarRequest(_a) {
         return __awaiter(this, void 0, void 0, function* () {
-            var { method, path, data, params, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON, headers } = _a, opt = __rest(_a, ["method", "path", "data", "params", "contentType", "headers"]);
+            var { method, path, data, params, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON, headers: paramsHeaders } = _a, opt = __rest(_a, ["method", "path", "data", "params", "contentType", "headers"]);
             try {
                 yield this.getAccessToken();
-                const actualHeaders = Object.assign(Object.assign({ "Content-Type": contentType, [this.tokenHeaderName]: this.getAuthToken() }, (this.headers || {})), (headers || {}));
-                const response = yield axios_1.default.request(Object.assign(Object.assign({}, opt), { method, url: `${this.apiUrl}${path}`, httpsAgent: this.agent, headers: actualHeaders, data,
+                const headers = Object.assign(Object.assign({ "Content-Type": contentType, [this.tokenHeaderName]: this.getAuthToken() }, (this.headers || {})), (paramsHeaders || {}));
+                const response = yield axios_1.default.request(Object.assign(Object.assign({}, opt), { method, url: `${this.apiUrl}${path}`, httpsAgent: this.agent, headers,
+                    data,
                     params, timeout: this.timeout }));
                 return response.data;
             }
             catch (error) {
-                lhisp_logger_1.default.error({
+                logger.error({
                     message: "LhispOauthClient.executarRequest",
                     method,
                     url: `${this.apiUrl}${path}`,