lhisp-oauth-client 1.0.21 → 1.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lhisp-oauth-client",
-  "version": "1.0.21",
+  "version": "1.0.24",
   "main": "src/index",
   "types": "src/index.d.ts",
   "repository": "git@bitbucket.org:leandro_costa/lhisp-oauth-client.git",

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

@@ -22,7 +22,7 @@ export declare class LhispOauthClient<iAccessToken extends AccessToken = AccessT
     protected tokenCreatedAt: number;
     protected tokenExpiresIn: number;
     protected sendAuthCredentialsOnRequestBody?: boolean;
-    protected forceTokenTypeToCamelCase?: boolean;
+    protected formatAccessToken?: (accessToken?: iAccessToken) => string;
     constructor(params: LhispOauthClientConstructorParams);
     getAuthHeaderValue(): string;
     parseData({ data, contentType }: {
@@ -33,10 +33,10 @@ export declare class LhispOauthClient<iAccessToken extends AccessToken = AccessT
     getAccessToken(): Promise<iAccessToken>;
     buildAccessToken(data: any): iAccessToken;
     getAuthToken(): string;
-    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>;
-    patch<ResponseType>({ path, data, contentType }: ExecutarRequestParams): Promise<ResponseType>;
-    post<ResponseType>({ path, data, contentType }: ExecutarRequestParams): Promise<ResponseType>;
-    delete<ResponseType>({ path, contentType }: ExecutarRequestParams): Promise<ResponseType>;
+    executarRequest<ResponseType>({ method, path, data, params, contentType, ...opt }: ExecutarRequestParams): Promise<ResponseType>;
+    get<ResponseType>(opt: ExecutarRequestParams): Promise<ResponseType>;
+    put<ResponseType>(opt: ExecutarRequestParams): Promise<ResponseType>;
+    patch<ResponseType>(opt: ExecutarRequestParams): Promise<ResponseType>;
+    post<ResponseType>(opt: ExecutarRequestParams): Promise<ResponseType>;
+    delete<ResponseType>(opt: ExecutarRequestParams): Promise<ResponseType>;
 }

package/src/lhisp-oauth-client.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -46,6 +57,7 @@ class LhispOauthClient {
         this.authHeaderName = params.authHeaderName || lhisp_oauth_client_t_1.defaultAuthHeaderName;
         this.tokenHeaderName = params.tokenHeaderName || lhisp_oauth_client_t_1.defaultTokenHeaderName;
         this.sendAuthCredentialsOnRequestBody = params.sendAuthCredentialsOnRequestBody;
+        this.formatAccessToken = params.formatAccessToken;
     }
     getAuthHeaderValue() {
         return `Basic ${Buffer.from(`${this.clientId}:${this.clientSecret}`).toString("base64")}`;
@@ -118,25 +130,21 @@ class LhispOauthClient {
         return data;
     }
     getAuthToken() {
-        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}`;
+        var _a, _b;
+        if (this.formatAccessToken) {
+            return this.formatAccessToken(this.accessToken);
+        }
+        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(_a) {
+        var { method, path, data, params, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON } = _a, opt = __rest(_a, ["method", "path", "data", "params", "contentType"]);
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.getAccessToken();
                 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}`,
-                    httpsAgent: this.agent,
-                    headers,
+                const response = yield axios_1.default.request(Object.assign({ method, url: `${this.apiUrl}${path}`, httpsAgent: this.agent, headers,
                     data,
-                    params,
-                });
+                    params }, opt));
                 return response.data;
             }
             catch (error) {
@@ -153,53 +161,29 @@ class LhispOauthClient {
             }
         });
     }
-    get({ path, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON, params }) {
+    get(opt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({
-                method: "GET",
-                path,
-                contentType,
-                params,
-            });
+            return this.executarRequest(Object.assign({ method: "GET" }, opt));
         });
     }
-    put({ path, data, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON }) {
+    put(opt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({
-                method: "PUT",
-                path,
-                data,
-                contentType,
-            });
+            return this.executarRequest(Object.assign({ method: "PUT" }, opt));
         });
     }
-    patch({ path, data, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON }) {
+    patch(opt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({
-                method: "PATCH",
-                path,
-                data,
-                contentType,
-            });
+            return this.executarRequest(Object.assign({ method: "PATCH" }, opt));
         });
     }
-    post({ path, data, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON }) {
+    post(opt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({
-                method: "POST",
-                path,
-                data,
-                contentType,
-            });
+            return this.executarRequest(Object.assign({ method: "POST" }, opt));
         });
     }
-    delete({ path, contentType = lhisp_oauth_client_t_1.ContentType.APPLICATION_JSON }) {
+    delete(opt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.executarRequest({
-                method: "DELETE",
-                path,
-                contentType,
-            });
+            return this.executarRequest(Object.assign({ method: "DELETE" }, opt));
         });
     }
 }

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

@@ -17,7 +17,7 @@ export interface LhispOauthClientConstructorParams {
     grantType?: string;
     authContentType?: ContentType;
     sendAuthCredentialsOnRequestBody?: boolean;
-    forceTokenTypeToCamelCase?: boolean;
+    formatAccessToken?: (accessToken?: AccessToken) => string;
     debug?: boolean;
 }
 export interface ExecutarRequestParams extends AxiosRequestConfig {