lhisp-oauth-client 1.0.5 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lhisp-oauth-client",
-  "version": "1.0.5",
+  "version": "1.0.10",
   "main": "src/index",
   "types": "src/index.d.ts",
   "repository": "git@bitbucket.org:leandro_costa/lhisp-oauth-client.git",
@@ -12,13 +12,14 @@
     "test:watch": "jest --watchAll"
   },
   "devDependencies": {
-    "@types/jest": "^29.4.0",
-    "@types/node": "^18.11.18",
-    "jest": "^29.4.1",
-    "ts-jest": "^29.0.5",
-    "typescript": "^4.9.4"
+    "@types/jest": "^29.5.2",
+    "@types/node": "^20.3.1",
+    "jest": "^29.5.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^5.1.3"
   },
   "dependencies": {
-    "axios": "^1.2.5"
+    "axios": "^1.4.0",
+    "lhisp-logger": "^1.0.11"
   }
 }

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import https from 'https';
+import https from "https";
 import { AccessToken, ContentType, ExecutarRequestParams, LhispOauthClientConstructorParams } from "./lhisp-oauth-client.t";
 export declare class LhispOauthClient {
     protected authUrl: string;
@@ -26,11 +26,11 @@ export declare class LhispOauthClient {
     }): string | undefined;
     isTokenValid(token: AccessToken): boolean;
     getAccessToken(): Promise<AccessToken>;
-    buildAccessToken(data: Omit<AccessToken, 'created_at'>): AccessToken;
+    buildAccessToken(data: Omit<AccessToken, "created_at">): AccessToken;
     getAuthToken(): string;
-    executarRequest({ method, path, data, params, contentType }: ExecutarRequestParams): Promise<any>;
-    get({ path, contentType, params }: ExecutarRequestParams): Promise<any>;
-    put({ path, data, contentType }: ExecutarRequestParams): Promise<any>;
-    post({ path, data, contentType }: ExecutarRequestParams): Promise<any>;
-    delete({ path, contentType }: ExecutarRequestParams): Promise<any>;
+    executarRequest<ResponseType>({ method, path, data, params, contentType, }: ExecutarRequestParams): Promise<ResponseType>;
+    get<ResponseType>({ path, contentType, params }: ExecutarRequestParams): Promise<ResponseType>;
+    put<ResponseType>({ path, data, contentType }: ExecutarRequestParams): Promise<ResponseType>;
+    post<ResponseType>({ path, data, contentType }: ExecutarRequestParams): Promise<ResponseType>;
+    delete<ResponseType>({ path, contentType }: ExecutarRequestParams): Promise<ResponseType>;
 }

package/src/lhisp-oauth-client.js

@@ -17,6 +17,7 @@ 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 lhisp_logger_1 = __importDefault(require("lhisp-logger"));
 class LhispOauthClient {
     constructor(params) {
         if (params.certificado) {
@@ -28,7 +29,7 @@ class LhispOauthClient {
         }
         else {
             this.agent = new https_1.default.Agent({
-                rejectUnauthorized: false
+                rejectUnauthorized: false,
             });
         }
         this.certificado = params.certificado;
@@ -51,8 +52,10 @@ class LhispOauthClient {
         if (!data || Object.keys(data).length === 0)
             return undefined;
         switch (contentType) {
-            case lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON: return JSON.stringify(data);
-            case lhisp_oauth_client_t_1.ContentType.APPLICATION_X_WWW_FORM_URLENCODED: return querystring_1.default.stringify(data);
+            case lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON:
+                return JSON.stringify(data);
+            case lhisp_oauth_client_t_1.ContentType.APPLICATION_X_WWW_FORM_URLENCODED:
+                return querystring_1.default.stringify(data);
             default:
                 throw new Error(`Content Type Inválido: [${contentType}]`);
         }
@@ -67,33 +70,42 @@ class LhispOauthClient {
     }
     getAccessToken() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.accessToken && this.isTokenValid(this.accessToken)) {
-                return this.accessToken;
+            try {
+                if (this.accessToken && this.isTokenValid(this.accessToken)) {
+                    return this.accessToken;
+                }
+                // TODO: Implementar Refresh Token.
+                let authRequestOpt = {
+                    method: "POST",
+                    url: this.authUrl,
+                    httpsAgent: this.agent,
+                    headers: {
+                        [this.authHeaderName]: this.getAuthHeaderValue(),
+                        "Content-Type": this.authContentType,
+                    },
+                    data: {},
+                };
+                if (this.grantType)
+                    authRequestOpt.data.grant_type = this.grantType;
+                if (this.authScope)
+                    authRequestOpt.data.scope = this.authScope;
+                if (this.sendAuthCredentialsOnRequestBody) {
+                    if (this.clientId)
+                        authRequestOpt.data.client_id = this.clientId;
+                    if (this.clientSecret)
+                        authRequestOpt.data.client_secret = this.clientSecret;
+                }
+                authRequestOpt.data = this.parseData({
+                    data: authRequestOpt.data,
+                    contentType: this.authContentType,
+                });
+                const response = yield axios_1.default.request(authRequestOpt);
+                return this.buildAccessToken(response.data);
             }
-            // TODO: Implementar Refresh Token.
-            let authRequestOpt = {
-                method: 'POST',
-                url: this.authUrl,
-                httpsAgent: this.agent,
-                headers: {
-                    [this.authHeaderName]: this.getAuthHeaderValue(),
-                    'Content-Type': this.authContentType,
-                },
-                data: {},
-            };
-            if (this.grantType)
-                authRequestOpt.data.grant_type = this.grantType;
-            if (this.authScope)
-                authRequestOpt.data.scope = this.authScope;
-            if (this.sendAuthCredentialsOnRequestBody) {
-                if (this.clientId)
-                    authRequestOpt.data.client_id = this.clientId;
-                if (this.clientSecret)
-                    authRequestOpt.data.client_secret = this.clientSecret;
+            catch (error) {
+                lhisp_logger_1.default.error({ message: "LhispOauthClient.getAccessToken", error });
+                throw error;
             }
-            authRequestOpt.data = this.parseData({ data: authRequestOpt.data, contentType: this.authContentType });
-            const response = yield axios_1.default.request(authRequestOpt);
-            return this.buildAccessToken(response.data);
         });
     }
     buildAccessToken(data) {
@@ -104,47 +116,72 @@ class LhispOauthClient {
         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}`;
     }
-    executarRequest({ method, path, data, params, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON }) {
+    executarRequest({ method, path, data, params, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON, }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.getAccessToken();
-            if (!((_a = this.accessToken) === null || _a === void 0 ? void 0 : _a.token_type)) {
-                console.log("## LHOAUTH2 NO TOKEN ?:", this.accessToken);
+            try {
+                yield this.getAccessToken();
+                if (!((_a = this.accessToken) === null || _a === void 0 ? void 0 : _a.token_type)) {
+                    console.log("## LHOAUTH2 NO TOKEN ?:", this.accessToken);
+                }
+                let headers = {
+                    "Content-Type": contentType,
+                    [this.tokenHeaderName]: this.getAuthToken(),
+                    // ...this.headers
+                };
+                const response = yield axios_1.default.request({
+                    method,
+                    url: `${this.apiUrl}${path}`,
+                    httpsAgent: this.agent,
+                    headers,
+                    data,
+                    params,
+                });
+                return response.data;
+            }
+            catch (error) {
+                lhisp_logger_1.default.error({ message: "LhispOauthClient.executarRequest", method, path, data, params, contentType, error });
+                throw error;
             }
-            let headers = {
-                'Content-Type': contentType,
-                [this.tokenHeaderName]: this.getAuthToken(),
-                // ...this.headers
-            };
-            const response = yield axios_1.default.request({
-                method,
-                url: `${this.apiUrl}${path}`,
-                httpsAgent: this.agent,
-                headers,
-                data,
-                params
-            });
-            return response.data;
         });
     }
     get({ path, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON, params }) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({ method: 'GET', path, contentType, params });
+            return this.executarRequest({
+                method: "GET",
+                path,
+                contentType,
+                params,
+            });
         });
     }
     put({ path, data, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON }) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({ method: 'PUT', path, data, contentType });
+            return this.executarRequest({
+                method: "PUT",
+                path,
+                data,
+                contentType,
+            });
         });
     }
     post({ path, data, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON }) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({ method: 'POST', path, data, contentType });
+            return this.executarRequest({
+                method: "POST",
+                path,
+                data,
+                contentType,
+            });
         });
     }
     delete({ path, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON }) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({ method: 'DELETE', path, contentType });
+            return this.executarRequest({
+                method: "DELETE",
+                path,
+                contentType,
+            });
         });
     }
 }

package/src/lhisp-oauth-client.t.js

@@ -5,7 +5,7 @@ var ContentType;
 (function (ContentType) {
     ContentType["APPLICATION_JSON"] = "application/json";
     ContentType["APPLICATION_X_WWW_FORM_URLENCODED"] = "application/x-www-form-urlencoded";
-})(ContentType = exports.ContentType || (exports.ContentType = {}));
+})(ContentType || (exports.ContentType = ContentType = {}));
 exports.defaultGrantType = 'client_credentials';
 exports.defaultAuthContentType = ContentType.APPLICATION_X_WWW_FORM_URLENCODED;
 exports.defaultAuthHeaderName = 'Authorization';