Merge pull request #239 from reportportal/develop

Release 5.5.2

Author: AmsterGet

CHANGELOG.md

@@ -1,3 +1,5 @@
+### Fixed
+- Disable axios default proxy in case of custom proxy agent used.
 
 ## [5.5.1] - 2025-10-29
 ### Fixed

VERSION

@@ -1 +1 @@
-5.5.1
+5.5.2-SNAPSHOT

lib/oauth.js

@@ -154,8 +154,9 @@ class OAuthInterceptor {
     const proxyAgents = hasCustomAgents
       ? {}
       : getProxyAgentForUrl(this.tokenEndpoint, this.restClientConfig);
+    const usingProxyAgent = Object.keys(proxyAgents).length > 0;
 
-    if (this.debug && Object.keys(proxyAgents).length > 0) {
+    if (this.debug && usingProxyAgent) {
       this.logDebug(`Making token request to ${this.tokenEndpoint} with proxy agent`);
     }
 
@@ -167,6 +168,8 @@ class OAuthInterceptor {
       // Custom agents from restClientConfig (if provided) take precedence
       ...(this.restClientConfig.httpsAgent && { httpsAgent: this.restClientConfig.httpsAgent }),
       ...(this.restClientConfig.httpAgent && { httpAgent: this.restClientConfig.httpAgent }),
+      // Explicitly disable axios built-in proxy when using custom agents
+      ...(usingProxyAgent && { proxy: false }),
     });
 
     const {

lib/rest.js

@@ -70,6 +70,7 @@ class RestClient {
       this.restClientConfig &&
       ('httpsAgent' in this.restClientConfig || 'httpAgent' in this.restClientConfig);
     const proxyAgents = hasCustomAgents ? {} : getProxyAgentForUrl(url, this.restClientConfig);
+    const usingProxyAgent = Object.keys(proxyAgents).length > 0;
 
     return this.axiosInstance
       .request({
@@ -78,6 +79,8 @@ class RestClient {
         data,
         ...options,
         ...proxyAgents,
+        // Explicitly disable axios built-in proxy when using custom agents
+        ...(usingProxyAgent && { proxy: false }),
         headers: {
           HOST: new URL(url).host,
           ...options.headers,