fix(proxy): apply authentication

This PR applies the authentication to the HTTP Proxy inside the default Agent used by Axios.

server/api/externalapi.ts

@@ -37,8 +37,6 @@ class ExternalAPI {
         ...options.headers,
       },
     });
-    this.axios.interceptors.request = axios.interceptors.request;
-    this.axios.interceptors.response = axios.interceptors.response;
 
     if (options.rateLimit) {
       this.axios = rateLimit(this.axios, {

server/api/tautulli.ts

@@ -123,8 +123,6 @@ class TautulliAPI {
       }${settings.urlBase ?? ''}`,
       params: { apikey: settings.apiKey },
     });
-    this.axios.interceptors.request = axios.interceptors.request;
-    this.axios.interceptors.response = axios.interceptors.response;
   }
 
   public async getInfo(): Promise<TautulliInfo> {

server/lib/imageproxy.ts

@@ -150,8 +150,6 @@ class ImageProxy {
       baseURL: baseUrl,
       headers: options.headers,
     });
-    this.axios.interceptors.request = axios.interceptors.request;
-    this.axios.interceptors.response = axios.interceptors.response;
 
     if (options.rateLimitOptions) {
       this.axios = rateLimit(this.axios, options.rateLimitOptions);

server/utils/customProxyAgent.ts

@@ -56,9 +56,12 @@ export default async function createCustomProxyAgent(
       : undefined;
 
   try {
-    const proxyUrl = `${proxySettings.useSsl ? 'https' : 'http'}://${
-      proxySettings.hostname
-    }:${proxySettings.port}`;
+    const proxyUrl =
+      (proxySettings.useSsl ? 'https://' : 'http://') +
+      proxySettings.hostname +
+      ':' +
+      proxySettings.port;
+
     const proxyAgent = new ProxyAgent({
       uri: proxyUrl,
       token,
@@ -68,16 +71,13 @@ export default async function createCustomProxyAgent(
     setGlobalDispatcher(proxyAgent.compose(noProxyInterceptor));
 
     axios.defaults.httpAgent = new HttpProxyAgent(proxyUrl, {
-      headers: token ? { 'proxy-authorization': token } : undefined,
+      headers: { 'proxy-authorization': token },
     });
     axios.defaults.httpsAgent = new HttpsProxyAgent(proxyUrl, {
-      headers: token ? { 'proxy-authorization': token } : undefined,
+      headers: { 'proxy-authorization': token },
     });
     axios.interceptors.request.use((config) => {
-      const url = config.baseURL
-        ? new URL(config.baseURL + (config.url || ''))
-        : config.url;
-      if (url && skipUrl(url)) {
+      if (config.url && skipUrl(config.url)) {
         config.httpAgent = false;
         config.httpsAgent = false;
       }