Merge branch 'master' into development

src/lhisp-oauth-client.ts

@@ -130,6 +130,10 @@ export class LhispOauthClient<iAccessToken extends AccessToken = AccessToken> {
         contentType: this.authContentType,
       });
       const resp = await axios.request(authRequestOpt);
+      if (!resp?.data) {
+        logger.error({ message: "LhispOauthClient.getAccessToken", resp });
+        throw new Error("Resposta inválida ao obter token de acesso.");
+      }
       this.accessToken = this.buildAccessToken(resp.data);
       this.tokenCreatedAt = new Date().getTime();
       this.tokenExpiresIn = this.accessToken?.expires_in || this.tokenCreatedAt + 60000;
@@ -149,6 +153,10 @@ export class LhispOauthClient<iAccessToken extends AccessToken = AccessToken> {
       return this.formatAccessToken(this.accessToken);
     }
 
+    if (!this.accessToken) {
+      throw new Error("Access Token não disponível.");
+    }
+
     return `${this.accessToken?.token_type} ${this.accessToken?.access_token}`;
   }
 
@@ -158,6 +166,7 @@ export class LhispOauthClient<iAccessToken extends AccessToken = AccessToken> {
     data,
     params,
     contentType = ContentType.APPLICATION_JSON,
+    headers: paramsHeaders,
     ...opt
   }: ExecutarRequestParams): Promise<ResponseType> {
     try {
@@ -167,9 +176,11 @@ export class LhispOauthClient<iAccessToken extends AccessToken = AccessToken> {
         "Content-Type": contentType,
         [this.tokenHeaderName]: this.getAuthToken(),
         ...(this.headers || {}),
+        ...(paramsHeaders || {}),
       };
 
       const response = await axios.request<ResponseType>({
+        ...opt,
         method,
         url: `${this.apiUrl}${path}`,
         httpsAgent: this.agent,
@@ -177,7 +188,6 @@ export class LhispOauthClient<iAccessToken extends AccessToken = AccessToken> {
         data,
         params,
         timeout: this.timeout,
-        ...opt,
       });
 
       return response.data;