Code cleanup

Signed-off-by: Rudy Flores <[email protected]>

packages/imperative/src/rest/src/client/ProxySettings.ts

@@ -45,20 +45,17 @@ export class ProxySettings {
      */
     public static getProxyAgent(session: ISession): Agent | undefined {
         const proxySetting = this.getProxySettings(session);
-        const proxyUrl = proxySetting.proxyUrl;
-        const proxyAuthorizationHeader = proxySetting.authSetting;
+        const proxyOptions = {} as ProxyOptions;
+        const authHeader = ProxySettings.getProxyAuthHeader(proxySetting);
+        if(authHeader) {
+            proxyOptions.headers = authHeader;
+        }
         if (proxySetting?.protocol === HTTP_PROTOCOL) {
-            const proxyAgentOptions = proxyAuthorizationHeader
-            ? { headers: { 'Proxy-Authorization': proxyAuthorizationHeader } }
-            : undefined;
-            return new HttpProxyAgent(proxyUrl, proxyAgentOptions);
+            return new HttpProxyAgent(proxySetting.proxyUrl, proxyOptions);
         }
         if (proxySetting?.protocol === HTTPS_PROTOCOL) {
-            const proxyAgentOptions = {
-                rejectUnauthorized: session.rejectUnauthorized ?? true,
-                headers: { 'Proxy-Authorization': proxyAuthorizationHeader }
-            };
-            return new HttpsProxyAgent(proxyUrl, proxyAgentOptions);
+            proxyOptions.rejectUnauthorized = session.rejectUnauthorized ?? true;
+            return new HttpsProxyAgent(proxySetting.proxyUrl, proxyOptions);
         }
     }
 
@@ -96,6 +93,12 @@ export class ProxySettings {
         return false;
     }
 
+    private static getProxyAuthHeader(proxySetting: ProxySetting): { [key: string]: string } | undefined {
+        return proxySetting.authSetting
+        ? { 'Proxy-Authorization': proxySetting.authSetting }
+        : undefined;
+    }
+
     /**
      * Parses environment variables for proxy servers.
      * @private
@@ -190,3 +193,8 @@ interface ProxySetting {
     protocol: HTTP_PROTOCOL_CHOICES,
     authSetting?: string
 }
+
+interface ProxyOptions {
+    headers?: { [key: string]: string },
+    rejectUnauthorized?: boolean
+}