lhisp-oauth-client 1.0.16 → 1.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lhisp-oauth-client",
-  "version": "1.0.16",
+  "version": "1.0.21",
   "main": "src/index",
   "types": "src/index.d.ts",
   "repository": "git@bitbucket.org:leandro_costa/lhisp-oauth-client.git",
@@ -12,14 +12,14 @@
     "test:watch": "jest --watchAll"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.2",
-    "@types/node": "^20.3.1",
-    "jest": "^29.5.0",
-    "ts-jest": "^29.1.0",
-    "typescript": "^5.1.3"
+    "@types/jest": "^29.5.8",
+    "@types/node": "^20.9.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "axios": "^1.4.0",
-    "lhisp-logger": "^1.0.11"
+    "axios": "^1.6.1",
+    "lhisp-logger": "^1.0.14"
   }
 }

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

@@ -1,5 +1,7 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import https from "https";
+import { AxiosHeaders } from "axios";
 import { AccessToken, ContentType, ExecutarRequestParams, LhispOauthClientConstructorParams } from "./lhisp-oauth-client.t";
 export declare class LhispOauthClient<iAccessToken extends AccessToken = AccessToken> {
     protected authUrl: string;
@@ -9,10 +11,10 @@ export declare class LhispOauthClient<iAccessToken extends AccessToken = AccessT
     protected authHeaderName: string;
     protected tokenHeaderName: string;
     protected authContentType: ContentType;
-    protected certificado?: string;
+    protected certificado?: string | Buffer;
     protected senhaCertificado?: string;
     protected authScope?: string;
-    protected headers?: Headers;
+    protected headers?: AxiosHeaders;
     protected grantType?: string;
     protected agent: https.Agent;
     protected accessToken?: iAccessToken;
@@ -20,6 +22,7 @@ export declare class LhispOauthClient<iAccessToken extends AccessToken = AccessT
     protected tokenCreatedAt: number;
     protected tokenExpiresIn: number;
     protected sendAuthCredentialsOnRequestBody?: boolean;
+    protected forceTokenTypeToCamelCase?: boolean;
     constructor(params: LhispOauthClientConstructorParams);
     getAuthHeaderValue(): string;
     parseData({ data, contentType }: {

package/src/lhisp-oauth-client.js

@@ -24,7 +24,7 @@ class LhispOauthClient {
         this.tokenExpiresIn = 0;
         if (params.certificado) {
             this.agent = new https_1.default.Agent({
-                pfx: params.certificado,
+                pfx: Buffer.isBuffer(params.certificado) ? params.certificado : Buffer.from(params.certificado, "base64"),
                 passphrase: params.senhaCertificado,
                 rejectUnauthorized: false,
             });
@@ -118,17 +118,17 @@ class LhispOauthClient {
         return data;
     }
     getAuthToken() {
-        var _a, _b;
-        return `${(_a = this.accessToken) === null || _a === void 0 ? void 0 : _a.token_type} ${(_b = this.accessToken) === null || _b === void 0 ? void 0 : _b.access_token}`;
+        var _a, _b, _c, _d, _e, _f, _g;
+        const tokenType = this.forceTokenTypeToCamelCase
+            ? `${(_c = (_b = (_a = this.accessToken) === null || _a === void 0 ? void 0 : _a.token_type) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.toUpperCase()}${(_e = (_d = this.accessToken) === null || _d === void 0 ? void 0 : _d.token_type) === null || _e === void 0 ? void 0 : _e.substring(1)}`
+            : (_f = this.accessToken) === null || _f === void 0 ? void 0 : _f.token_type;
+        return `${tokenType} ${(_g = this.accessToken) === null || _g === void 0 ? void 0 : _g.access_token}`;
     }
     executarRequest({ method, path, data, params, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON, }) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.getAccessToken();
-                let headers = {
-                    "Content-Type": contentType,
-                    [this.tokenHeaderName]: this.getAuthToken(),
-                };
+                const headers = Object.assign({ "Content-Type": contentType, [this.tokenHeaderName]: this.getAuthToken() }, (this.headers || {}));
                 const response = yield axios_1.default.request({
                     method,
                     url: `${this.apiUrl}${path}`,

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AxiosRequestConfig } from "axios";
 export interface Headers {
     [name: string]: any;
@@ -7,7 +8,7 @@ export interface LhispOauthClientConstructorParams {
     apiUrl: string;
     clientId: string;
     clientSecret: string;
-    certificado?: string;
+    certificado?: string | Buffer;
     senhaCertificado?: string;
     authScope?: string;
     authHeaderName?: string;
@@ -16,6 +17,7 @@ export interface LhispOauthClientConstructorParams {
     grantType?: string;
     authContentType?: ContentType;
     sendAuthCredentialsOnRequestBody?: boolean;
+    forceTokenTypeToCamelCase?: boolean;
     debug?: boolean;
 }
 export interface ExecutarRequestParams extends AxiosRequestConfig {